closes WebTales/rubedo#227
Merge branch 'develop' of github.com:WebTales/rubedo into develop