majorendre

…tion where applicable Took over this issue from Wei-Chiu Chuang. Added a few lines to the tests. All tests pass, the new feature works.