Added Win8.1 support (manually taken from MP1-master)