fixing a bug
adding private and public packages
Merge remote-tracking branch 'origin/master'