Merge branch 'hotfix/4' into develop

Forward port #4
Merge branch 'master' into develop
Merge pull request #12 in develop
CGIV-1743 Changes to allow support of resources instead of filenames
Merge branch 'develop' into CGIV-1743