Fixed issue 14 and 15
Fixed issue 14 and 15