Merge pull request #29 from pentestify/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop