bugfix
fixing running under leiningen
Merge remote-tracking branch 'upstream/master'