Merge branch 'hotfix/bugfix'
Merge branch 'release/0.0.2'
update submodule
add makefiles
update Makefile
update git submodules
fix for update