Code

Fixed bug #20