Merge pull request #27 from Neo139/patch-8