set to public
some changes
Merge origin/master