Merge pull request #47 from futhr/master-specs-n-fixes

Specs and fixes