First working version of 2.0
Merge pull request #2 from ollieread/2.0

Upgrade to Version 2.0