Fixing the copy mechanism.
Merge remote-tracking branch 'dlernstrom/master'
Bump version to 0.8.4