Strip WS in clojure code
Merge branch 'master' into macosx