Fix: Some private methods had public visibility.
Merge branch 'hotfix/0.2.1'