Merge pull request #2 from XenoAmess/patch-1