initial commit
small refactoring
Merge branch 'master' into feature1