Revert "Merge helsinki into master"
Merge pull request #2 from qdev-dk/revert-1-helsinki

Revert "Merge helsinki into master"