Merge pull request #113 from Duikmeester/master

Expanded functionality for resources