Merge pull request #395 from udienz/master