Update to 1.2

Update to 1.2
Update to 1.2

Update to 1.2
Merge pull request #32 from CascadeFramework/master

Update to 1.2
Merge pull request #33 from jslegers/master

Update to 1.2