Fix/issues/29

Fixed #29.