Modernized to C++11 style
Generalized key combiner
Fixed output directory on Debug build
minor code tidyup