Merge pull request #18 from Izakey/develop