Issue 12

Fixes issue 12.