Added sub requirements to setup
added xieandleo2004

Still needs testing etc.