Merge pull request #8 from skk/master

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

Merge pull request #8 from skk/master