Merge pull request #509 from dalkon/master

Use move symantics.