fixed 1 minute restart bug
Merge branch 'Jon' into Develop