Changed type checking for options to handle iterables
Checking tuple or list
Fixed tests
Merge pull request #5 from shaunduncan/master

Changed type checking for options to handle iterables