#236 & #291

Should work... I need to get round to installing locally to properly test but hey ho! 

#236
#291