Merge pull request #3 from starverte/master

Merge from master
Upgrade to Leather 2.0
Merge pull request #37 from mbeall/master

Upgrade to Leather 2.0