Issue #148, #149, #150 & #151