Fixes #1
Merge branch 'feature-pat' into develop
Version bump to 0.3.6
Merge branch 'release-0.3.6'