overrideing Edgars Commit
Merge origin/master