Implemented the two remaining directions (fixes #6, fixes #7)