Issue1

Consider pulling this patch for #1