better structure for building the project
Merge branch 'master' into 2.2-wip
bumped