ff

ff
Merge pull request #1 from trialll/ff

ff
Merge pull request #2 from trialll/master

maste from ff