Pull request

Please accept various fixes of the following issues https://github.com/aeremenok/unisender/issues?milestone=1&state=closed