Minor changes
Merge branch 'master' of https://github.com/kasra-hosseini/FFM