Merge pull request #1 from evildmp/master

Updating master to definitive