I should commit more often.

Fixes issues #1