Fixed issue 118
Fixed issue 117.