Merge pull request #106 from antmicro/use-make-env

Transition to use make-env