Changed variable names to allow compiling with c++
Merge pull request #1 from seken/master

Changed variable names to allow compiling with c++