Merge pull request #8 from skk/master

Merge master.