Fixed problems with names in citation.
Merge branch 'master' into pako-devel
Updated readme