hypenated words get split now
Merge branch 'master' of ssh://localhost:1080/zuloo/fast