Added windows support.
Updated rest of demo to CR1.
Tagged for version 0.6 with CR1.