Issue/ubuntu 14 04

After long hours of hard work this great bugfix was born...