Addressed #63, attached interdiff and patch for same. Please review