Closes #31,
Commented some things