Merge branches 'master' and 'my_testing'
fix number 2
adding the help file