#1032 Move private functions inside the closable scope.
#1032 Move private functions inside the closable scope.
Merge pull request #1034 from pazguille/v1.0

V1.0