Feature/#7

Fixed issue #7