Issue 9

This closes #9