Modified internal behaviour of the options dictionary. Might expose some values later on,… Up for debate.
Merge branch 'master' into development