Update from upstream and some minor fixes#19

syntaxerror247 merged 2 commits intomainsyntaxerror247/VectorTouch:mainfrom

update-from-upstreamsyntaxerror247/VectorTouch:update-from-upstreamCopy head branch name to clipboard