Merge pull request #2 from burtigit/local

OG-5
Merge pull request #3 from burtigit/local

OG-6
OG-7
OG-8

merge
Merge branch 'burtigit-local'
Merge pull request #5 from burtigit/local

OG-9
Merge pull request #6 from burtigit/local

OG-10
OG-11
OG-12 merge
OG-13