#355 and #375

#355 updates
#375 updates