Merge pull request #335 from treeowl/move-merge