Update for getopts changes
Merge pull request #172 from ebfe/strbuf-getopts

Update for getopts changes