Merge tag '0.3.3' into develop

release.
next snapshot.
test updates.
updated resource resolution.
version.
Merge branch 'release-0.3.4'