Options style changes
Merge branch 'develop' of github.com:ArianaLas/Jamii into develop