Fixed up the header. Fixes #8.

Closes #6
Closes #7