Fixed visibility
Merge pull request #417 from lyrixx/visibility

Fixed visibility of some classes to match parent visibility