Development

Merge changes to master branch to provide more and better testing.  Also, provide a couple bug fixes and query_by_options method.