Fix #52
Merge remote-tracking branch 'upstream/master' into pm_tweaks