pity11 ready
Merge branch '2.0' of https://github.com/musicahumana/Oppen into 2.0