Fixes in functions check_var_set, etc...
Merge branch 'master' of https://github.com/khvalera/mkpkg

Conflicts:
	mkpkg