Merge pull request #45 from rackerjoe/master

Merged automatically by jenkins after successful build test
Remove the rewind