Addressed #17, attached interdiff for same. please review