Fixes #191 and some typos
Merge branch 'ofelia.development' of https://github.com/fp7-ofelia/ocf into ofelia.development