Merge pull request #18 from XenoAmess/patch-1