Merge pull request #24 from forter/develop

v0.7
Merge pull request #26 from forter/develop

v0.8
Merge pull request #28 from forter/develop

v0.8.1
Merge branch 'prod' into develop