fix bug
Merge branch 'master' of github.com:mahmoodramzani/20121228