Merge branch 'dev'
add picture for my father. I miss him every day...