FUCK YOU, CLOSE #98
Surnames fix
Fix for #107
Fixing regression #108
Merge remote-tracking branch 'upstream/master'