Merge pull request #19 from mkelley/dev

dev rollup
Merge pull request #20 from mkelley/dev

Update master to v2.0.0
Merge branch 'master' into dev