fix
Merge branch 'master' of https://github.com/michidk/haste-server

test