newFeature branch forwfoard
Hotfix.
hotfix plus
Merge branch 'newFeature'