Attempted fix for #117
Merge pull request #118 from Cottser/117-paste

Attempted fix for #117