updates for 1.1, 1.2, 1.3 and 2.0
Merge pull request #1 from dbashford/2point0

updates for 1.1, 1.2, 1.3 and 2.0