I am merging Visctor Atanassov
Merging the differences with Viktor
Merge branch 'master' of https://github.com/wingman007/fmi