Merge pull request #15 from mlocati/master

Mark some method as internal