Fixes KingGreed/EpiTime#4 and ready for production