Merge pull request #7 from Hank92/master

Merge