Release: version 2.0.1
Merge remote-tracking branch 'upstream/master' into upstream-merge
bumped version after pulling upstream changes.
Merge pull request #12 from scopely/upstream-merge

Upstream merge