Adding Zuli by @kaelvofraga
Condensing all changes from pull request into one commit.
Closes #183
Closes #184