fix minor bugs
Merge branch 'master' of git@github.com:WebTales/rubedo.git