Merge pull request #4 from tkah/master

Merge pull request #3 from tkah/testb1