Merge pull request #43 from hdansou/master

Performed a clean up of of the all IIS related code.