Merge pull request #10 from Izakey/develop