Move for conflict.
Merge pull request #1 from samth/master

Move for conflict.