Making contained optional

I've come across a use case in out lab where we need optional to be set to false, so I've made it possible to set this as an option. Have a look at it and say if you think it's reasonable or not to include it in the main code base.