Closes #31 #3