Fixed distro files
Merge branch 'dev' into heads