Merge lukas into master

Because #4 got fixed.