Merge branch 'hotfix/bitops_offset'
Allow for NULL to be passed in our optional arguments and just
ignore it if it is (but still set the key).

Addresses #407
Merge branch 'hotfix/allow_null_set_options' into develop