Merge tag 'v1.0.5'

1.0.5
Allow other option properties to pass through
Bump version
Merge branch 'release/1.0.6' into production