Changed string on line 230 for testing.
Merge pull request #29 from detonation0/JP-x2

Changed string on line 230 for testing.
Resolved merge conflict.