Cumulative update

Issues
#240 
#254 
#267 
#270 
#271