[#55] made all tests pass