issues 14 & 15

bug fixing