Changed visibility of some methods.
Merge origin/master