Small improvements and bugfixes
Merge branch 'master' of https://github.com/cuore/framework