Issue 105

Fixed