Updates
Merge pull request #3 from Riib11/master

Updates