closes #83
Merge branch 'master' of github.com:WebTales/rubedo