Added full command line options to README. Fixes issue #44
Remove default=None from OptionParser options (#43)
Merge remote-tracking branches 'origin/master' and 'upstream/master'