Fix cmlenz#21 - Wait for load before removal.
Merge pull request #22 from braddunbar/cancelled

Fix cmlenz#21 - Wait for load before removal.