Merge pull request #380 from usernamestaken/master