Merge pull request #354 from usernamestaken/master