improving code, some comments
Merge branch 'dev'