Finished all basic functionalities
Update readme file info
Merge branch 'develop'