Merge pull request #1 from burtigit/master

OG-3