* some code cleanup before first full release
Merge branch 'dev'