Merge pull request #26 from Maxiebyte/master

merge