Script review and some options addition
Merge branch 'develop'