Merge pull request #8 from jay3/master

Version 1.2.0