Merge pull request #18 from jlambert121/master

version bump: 1.2.0