david's error fix
Merge branch 'master' of https://github.com/royb3/Energy_Vampires