Merge pull request #6 from skk/develop

Merge pull request #5 from skk/master
Merge branch 'develop'
Merge pull request #7 from skk/develop

Merge develop.
Merge pull request #8 from skk/master

Merge master.