Merge pull request #3 from failedxyz/master

Master