Addressed #15, attached interdiff for same. please review