Merge pull request #2 from ctlin2/master

Merge pull request #1 from ctlin2/brach1
Merge pull request #3 from ctlin2/brach1

Merge pull request #2 from ctlin2/master