Merge pull request #8 from tsheasha/master

Sctipts
Merge pull request #9 from tsheasha/hotfix

Merge pull request #8 from tsheasha/master