calthaus Merge branch 'master' of https://github.com/calthaus/Ebola