New distro system, first fix
Merge pull request #111 from PatrickDeelen/master

New distro system, first fix