Issue 20

Resolves #20