some changes
Merge branch 'free'