Fixed #104.
Fixed #96.
Merge pull request #107 from frmwrk123/fix/visibility

Fixed #104.