Honor options
Merge pull request #1 from demarque/honor-options

Honor options