Merge pull request #6 from tkah/master

Merge pull request #5 from tkah/testb1
Merge pull request #7 from tkah/testb1

Merge pull request #6 from tkah/master