Fixed program options
Merge branch 'master' of github.com:tfursten/SI-cpp