Issue 12

Resolves #12