code cleanup
Merge branches 'dev' and 'master'