Merge pull request #1 from jay3/master

Version 1.2.0