CLOSES #178 #249