Add support for overlapping shifts
Merge pull request #16 from Apogaea/piper/overlapping_shifts

Add support for overlapping shifts