More correct handling of pasted content
Merge pull request #11 from metalabdesign/better_paste_handling

More correct handling of pasted content