Added manager windows compatibility
Updated for Windows compatibility changes