michael: some refactoring to fretpositioning
Merge remote branch 'origin/master'