Merge pull request #16 from iKarith/master