Fixed #108 and #109.
Merge pull request #110 from frmwrk123/fix/visibilityACP

Fixed #108 and #109.