Changed option switches slightly for robustness
Fixed typo
Merge pull request #6 from imheresamir/master

Updated option switches