Created by: rick-gnous
Fix issues #165 (closed) and #149 (closed) Fix new issue due to libravatar link