Fix a bug in restore
Added java doc
Improve color display
Merge remote-tracking branch 'origin/master' into chunhui