add line A
Merge branch 'master' into dev
add line B
Merge pull request #22 from leirocky/dev

Dev