Pull request for the dark lord of the underworld

PR #666 YES!

Simple PR. Simple commits. Forgotten things made to exist and all.