Merge pull request #1 from hkminegod/master

Merge v1.1.4 to TechMastary
Merge pull request #1 from TechMastary/master

Merge pull request #1 from hkminegod/master