Merge pull request #1 from oftn/master

merge OFTN version