update
fixed bugs on get results
Merge origin/master