Addressed #4, Attahced patch & interdiff for same. Please review