Merge pull request #5 from iKarith/master