Merge pull request #460 from jplitza/master