Merge pull request #9 from KelSolaar/patch-1