Minor bugfix

Minor bugfix
Merge pull request #64 from CascadeFramework/master

Minor bugfix
Merge pull request #65 from jslegers/master

Minor bugfix