Merge branch 'options'
Merge pull request #1 from mooremc/master

Merge branch 'options'