Merge pull request #9 from jread-usgs/modifiedWstr

Modified wstr
modified per McBride params