added support to windows 8.1

regex + test cases