Updated version, removed references to demo data. Ready for test