Merge pull request #10 from gaillard/master

code coverage and some niceties..