Problems 4, 5 and 6
Merge pull request #5 from nordsieck/bolus

Problems 4, 5 and 6