Merge pull request #24 from Maxiebyte/test

Merge test into master.