minor improvements to the docs
merged master
updated docs
minor refactor
striped out invalid tests
removed print
Merge pull request #8 from qoda/feature/options/generic

Minor refactor and cleanup