Improved setup procedure; verified functionality on a Windows machine