Updated to 1.2.0
Merge pull request #4 from mwanji/update_to_1.2.0

Updated to 1.2.0