Add options functionality
Merge branch 'master' into results
Merge results
Merge pull request #10 from jmdaugherty/results

Results