Adapted to changes in code
Merge branch 'master' of https://github.com/cogneco/ooc-kean
Merge pull request #31 from EmilWestergren/master

Adapted to changes in code