cleaned up demo/lib
Merge branch 'develop'