fix #139, fix #138
Merge branch 'develop' of github.com:WebTales/rubedo into develop