Fix to work under windows, and fix to allow recursive class scrutures