make assertion in test
enhance readme
merge conflict
Merge pull request #4 from jwerle/master

woot