improve merging of strict key based options
Merge pull request #150 from dereuromark/develop

improve merging of strict key based options