Fixed it up.

Closes #1