Develop

Fixed #22