Merge branch 'development'

Merged. Fix build bug.
Merge branch 'development'

Merged. Modified README
Modified README again