Renamed options => option
Merge branch 'master' of github.com:smathieu/prosperity