Merge pull request #6 from Jay1/master

Patch 1.08a