Merge pull request #86 from Hiflylabs/zsombor-flds-patch-2