Changed play to use new timings in 16th notes
Merge remote-tracking branch 'upstream/master'