fixed syntax error
final demo version
removed unused imports
Merge branch 'master' into ab-pins

* master:
  removed unused imports
  final demo version
  fixed syntax error