Fixes by Marilina
Merge branch 'master' of github.com:jjconti/novela-workflow