Pull request to fredpalmer/develop from fredpalmer/bug/empty-options

Please pull these commits into fredpalmer/develop.  Here is the latest commit message:

*"Adding testing script"*