Merge pull request #28 from Neo139/patch-9