Merge pull request #19 from wallner/OSNG-190

Osng 190