2nd commit
Merge branch 'master' of github.com:Wentzell/frg_O2