Fixing copyrights, see #287
Merge branch 'ohtwo' into state-refactoring