Merge pull request #360 from shenrie/master

Refined prepare resource support
Bumped ion-defs