Revise infolines
Merge branch 'dev'