fix #4
Merge branch 'master' of github.com:Hipo/scribe-web