some stuff which hopefully doesn't break stuff
Merge branch 'master' of https://github.com/YRSNorwich/Datamon