Merge pull request #19 from forter/develop

Upgrade
Merge pull request #22 from forter/develop

version 0.2.15
Merge branch 'prod' into develop