Merge pull request #13 from wayne5540/t5290

T5290
Merge pull request #14 from wayne5540/t5360

T5360
annotate
Merge branch 'master' into t5382
:gem: annotate