Issue 11

This closes #11