switched to simple push mode.
Merge branch 'dev'