Bug fix and improvement
Detection of Widnows 8