Adding testing script
Merge pull request #26 from fredpalmer/bug/empty-options

Pull request to fredpalmer/develop from fredpalmer/bug/empty-options
Merge pull request #27 from fredpalmer/develop

Update master from develop