Merge branch 'hotfix/500'
Merge branch 'release/rexus'
minor tweaks
update licence so split content & code
Merge branch 'hotfix/readme-licence' into develop