#7 fixed. #8 commited

#7 
#8