~ res adaption
Merge branch 'master' of https://github.com/judos/fisk.git