final fixes
Merge pull request #89 from lukaswelte/different

final fixes