Issue 11

Marked as fixed.