Correct C&J
Merge pull request #23 from Bin4ry/master

Correct C&J