version 1.2.0
Merge pull request #12 from jlambert121/v1.2.0

version 1.2.0