Fix #86
fix #87
Fix #86
change visibility update
Merge branch 'master' of https://github.com/PonySDK/PonySDK.git