Merge pull request #59 from mpeuster/master

Resource model and integration