Fixed #104
Merge branch 'develop' into staging