Minor bugfix

Minor bugfix
Merge pull request #66 from CascadeFramework/master

Minor bugfix
Merge pull request #67 from jslegers/master

Minor bugfix