Merge pull request #161 from YGrylls/collection

Ftr: add collection support according to java implementation