Working on ambiguity resolution.
Merge branch 'master' of https://github.com/Ramqvist/shrdlite-template
Ambiguity resolution works good.