Fixed Some Bugs #80
Merge branch 'development' into demo