Merge pull request #2 from jberger/master

fixed failing test
Merge pull request #3 from jberger/master

fix documentation errors in ::HasMany
Merge branch 'master' into blocking