Added configurable key formatting.
Merge branches 'development' and 'master'