More work done.
Merge branch 'master' of https://github.com/sormuras/compayler.git