Addressed #11, attached patch and interdiff for same. please review