Feature/win81

Please review and test my current work.