Stoyan Revov fmi pull request

Demo: http://fmistoyanrevov.eu01.aws.af.cm/fmi/stoyanrevov