Merge pull request #49 from ledbettj/develop

merge develop for v1.2.0
bump version for release.