Update to version 1.5

Update to version 1.5
Merge pull request #15 from jslegers/master

Update to version 1.5
Merge pull request #43 from CascadeFramework/master

Update to version 1.5