Issues #16 #17 done