fixes #135
Merge branch 'master' of https://github.com/zrho/afp