Merge pull request #14 from medullan/master

merge latest into develop
remove submodule but retain files
remove submodule but retain files
Merge pull request #15 from medullan/develop

Develop