Final update - v1.0
 - bug fixes
 - clear unnecessary codes
 - add comments