Merge pull request #489 from aglarendil/master

FF do develop branch