Merge pull request #326 from dabido/master