Updated branch to version 2.0 code
Merge pull request #22 from Jonnycake/v2.0

Updating master branch to version 2.0 code