Thanks Lex! Closes #319