Merge pull request #85 from mtausig/master

Renamed variables 'private' and 'public' to prevent compilation problems with C++