some changes and some refactoring!
Merge branch 'master' of github.com:marcelrf/shepherd