added support simple merge
Merge branch 'develop' of https://github.com/objectpartners/cloaked-archer into develop