Closes #252 #251 #250