Merge pull request #186 from evoskuil/version2

Restore visibility flags.