Fix condition in constructor
Fix condition in function point.
Merge branch 'nikitsky' of https://github.com/nikitskynikita/evol-git