replaced tar with proper one
Merge branch 'master' into ubuntu