ready for merge #157 #160

@mariam-ismail 
mariam please remerge
#157 
#160