Merge pull request #374 from nolith/master