updated to work with clojure 1.6