add/fix specs
Merge pull request #10 from johanness/master

add/fix specs