Merge branch 'master' into issue-62-rewrite-to-typescript