Merge pull request #457 from jplitza/master