Feature/28

fixed #28