Jinx

Improved the R logic and other minor changes.
Merge pull request #28 from PingoSharp/patch-1

Jinx