Merge pull request #28 from panpawn/patch-8