minor bug fixes
license updated
Merge branch 'release/0.9.5' into develop

minor bug fixes
license updated