Merge branches 'dev' and 'master' into dev
fixed some issues
Merge branches 'dev' and 'master'