Issues #13 done