Merge branch 'master' of https://github.com/temraz/tem-sh.git