fixed refactoring bugs
Merge branch 'master' of github.com:luca-m/emotime