add ability to handle overlapping shifts
Merge pull request #6 from Apogaea/piper/add_ability_to_handle_overlapping_shifts

add ability to handle overlapping shifts