clean up warp operation
Merge pull request #143 from simboss/master-warp

 clean up warp operation