Compatibility with cider's master
Merge pull request #19 from prepor/master

Compatibility with cider's master