Merge pull request #3 from cbos-team/master

Refactoring and Documentation
hotfix
removed target
Merge pull request #7 from dupps/master

merge latest changes