Merge pull request #18 from HacKurx/patch-1