Merge pull request #15 from iKarith/master