integration for acceptance
Merge branch 'development' of https://github.com/maxcobmara/ogma into development