Merge pull request #10 from JackStat/master

merge
Merge pull request #16 from dcaff/master

Merging