Merge pull request #8 from JackStat/master

merge
Merge pull request #9 from JackStat/master

merge
Merge pull request #15 from dcaff/master

merge