Updated integration mode
Integration mode safe-guard
Merge pull request #36 from burstly/dev

Integration mode updates