Issue/#26

Fixed #26