Added makefile
Merge branch 'ci_integration'
Fixed ambigous constructor