updated according reviews
Merge remote-tracking branch 'origin/issue100' into issue100