keep private vars private
merged fixes by @snorfalorpagus
Merge pull request #120 from vfigueiro/master

Fixes by @snorfalorpagus in #116, keeping private vars private