Issue26

merge request to fix issues #11 , issue #26 and issue #28