[DEVELOP]
- Analysing code
- Fixing some bugs and error
- Deleted some files
- Arranging code
[DEVELOP]
- Modified some routines
[DEVELOP]
- Modified some routines
Merge branch 'develop'