Merge changes for release 0.3.1

Minor bugfixes and permission changes