Merge pull request #2 from DarkstarProject/master

Merge