emarai Merge pull request #2 from ParasHQ/dev