fix other changes
Merge pull request #1 from pporfilio/master2

fix other changes