Feature/34

fixed #34 
fixed #37