Updates
Merge branch 'master' of https://github.com/erikduvet/ErikAndersLabs
Updated to support restart, a little buggy...