add missing $collectionClass field
fix linefeed errors
Merge branch 'hotfix/28'

Close #28
Merge pull request #27 from markushausammann/master

add missing $collectionClass field
Merge branch 'hotfix/27' into develop

Forward port #27