Upgrade to 1.3

Upgrade to 1.3
Merge pull request #36 from CascadeFramework/master

Upgrade to 1.3
Merge pull request #37 from jslegers/master

Upgrade to 1.3