my commit
Merge branch 'dev' of https://github.com/Fyfar/fb2r into dev