Merge change Ic8d6b3cb

* changes:
  Fix Constructor and Method to not expose their internals.