Added feature #9 and adjusted web.config to close #7