Merge pull request #3 from Izakey/develop