Suggested patch for issue 61

A bit dirty, but gets the job done?