Second update
Merge branch 'master' of https://github.com/nbivanov/fmife into nbivanov-master
Merge branch 'nbivanov-master'