add problem 26, fixed bug in problem 17, added tests