modified fon forked branch
Merge pull request #2 from RaptorSoft/master

modified fon forked branch