Closes #32 #48