Adjusted pitch classes.
Merged master.