Update valid TLDs list and fix #368

First commit updates list od valid tlds.
Second fixes related #368