Merge pull request #18 from zenangst/master

Add wrap around setting
Sync rev.