Merge pull request #1 from thewebhatesme/master

Sync upstream repository with fork