V0.9.6

#25 
#27 
#28 
#29 
#30