Working on fixing ambiguity code.
Merge branch 'master' of https://github.com/Ramqvist/shrdlite-template
Cleanup of shrdlite