Merge pull request #1 from burtigit/master

OG-3
Merge remote-tracking branch 'upstream/master' into local
OG-5