Add several options, Fix 0 value issue
Bump version
Merge branch 'hotfix/0.1.1' into develop