I fixed little things and analysis logic.
Merge branch 'rfrost'