Issue 5

Patch for #5