Third update
Final commit
Merge branch 'master' of https://github.com/nbivanov/fmife into nbivanov-master
Niki Ivanov