Merge pull request #5 from HCDevelopers/master

updates
Merge pull request #24 from PsychoCoderHC/master

Merge pull request #5 from HCDevelopers/master