so that options dont override
0.2.1
Merge pull request #19 from michelle-becker/development

Development