ZOMG MERGE
Merge branch 'master' of https://github.com/BrendanBenshoof/CHRONUS
added promise