some modification
Merge branch 'dev'
some explaination