Merge pull request #2 from hkminegod/master

Version 1.2
Merge pull request #4 from TechMastary/master

Merge pull request #2 from hkminegod/master