Merge pull request #1 from oftn/master

merge OFTN version
Merge pull request #1 from nisstyre56/master

Merge pull request #1 from oftn/master