Issue 3

This closes #3