Updates
Merge pull request #5 from Drezzd/master

Updates