Merge pull request #6 from HCDevelopers/master

updates on logical feedback
Merge pull request #26 from PsychoCoderHC/master

Merge pull request #6 from HCDevelopers/master