Merge pull request #355 from usernamestaken/master