Merge pull request #10 from Maxiebyte/master

merge