Feature/#26

Fixed issue #26