Tweaks
Merge remote-tracking branch 'trisberg/master'