large rework for Ubuntu 14.04
Merge branch 'hotfix/1.1.0'