IIS version improvements
Merge pull request #31 from gwroblew/remotes/trunk

IIS version improvements