merged new master and fixed valentins error