Issue 19

This branch closes #19.