Updated code to clojure 1.7