fixed copy constructor
Merge branch 'master' into graphics
fixing reset button