Closes #432
Editing this a little bit more!