Merge test
Merge pull request #10 from iameric1986/master

Merge test