A minor cleanup. Addresses #6
A minor bugfix. Addresses #14.