[issue #1] ci compliant build
Merge branch 'feature/1-enable-ci-build' into dev
resolved merge conflicts to ours