Add generation label
Merge branch 'master' of https://github.com/darkowl91/OPR.git
Fix NaN
Merge branch 'master' of https://github.com/darkowl91/OPR.git