Compatibility fixes#44

jsinge wants to merge 2 commits intorakhimov:masterrakhimov/cppdep:masterfrom

jsinge:masterjsinge/cppdep:masterCopy head branch name to clipboard