updating resource conversion
Merge branch 'master' of https://github.com/smillie/EDEN