Merge pull request #18 from Lxylona/master