fixed #13 added support for collection