commit #1 and #3

Signed-off-by: Zhang Jing <byrdkm17@gmail.com>
Merge branch 'master' of https://github.com/byrdkm17/DataTools