Merge pull request #408 from strawd/master