finish demonstration application
Merge branch 'develop'