Starting changes to support Windows8 platform as described by issue #3