merge OFTN version #19

Merged
weskerfoot merged 2 commits from master into master 12 years ago

2 Commits