FX fixes
Merge branch 'master' of github.com:pdigre/PersHomeProjects