Added mobile demo functionality
Merge branch 'issue-95' into develop