fix presence 2
Merge branch 'develop' into gh-pages