Dev

Fixed issue #13