Merge pull request #416 from udoprog/master