Updated Version Number.
Updated code to allow for options, and querying