Merge pull request #22 from Neo139/patch-3