Merge pull request #89 from slyness/develop

option is singular