close #24 and close #25
Merge remote-tracking branch 'origin/master'