from riju
minor comment changes :)
Merging with arthasdk master before day's work
Fixed conflicts occured during commenting out