Merge pull request #2 from hkminegod/master

Version 1.2