Added last Changes from https://github.com/kontalk/website
(https://github.com/kontalk/website/pull/6)