Merge pull request #317 from msfjarvis/hs/extra-flags

Merge pull request #317 from msfjarvis/hs/extra-flags #802