Nikola Rangelov final commit

https://github.com/NicoRan/fmiedd/commit/60dffffba9483c7161c617e927806a350d7d48ef
https://github.com/NicoRan/fmiedd/commit/32ecb260d22134407c73c330df8f5ec812eb9a13