Merge ClojureScript port (release 0.5.1)