Issue 5

This closes #5