Added modulo requested in #65