Add requirement for certain options
Merge branch 'development'
Release 0.0.7