Further fixes.
Merge pull request #28 from bizzl-greekdog/master

Further fixes.