Merge pull request #326 from Alexpux/master

Merg develop branch to master for 4.1.0 scripts release.