Start of Version 2.0
Merge pull request #5 from alanspencer/v2.0

Start of Version 2.0