Merge pull request #395 from thesues/master