FlatOPC stuff - minor tidy up
Contrib received from Alberto Zerolo 2012 12 22
Add license headers etc.