freakboy3742 Merge pull request #26 from rixx/patch-1