Merge pull request #7 from Izakey/develop