Some magic
Merge pull request #28 from clojurecup2014/bugging

Some magic