Merge branch 'release/1.0'
Merge branch 'release/1.0.1'
Merge pull request #2 from jrobinson3k1/master

Master