switched from stock resource collection to a pure manual/custom approach
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from marce155/master

hotfix for converter