Merge branch 'master' into prettier

Author: megoth

package.json

@@ -10,13 +10,13 @@
   ],
   "scripts": {
     "build": "npm run build-lib && npm run build-types",
-    "build-lib": "babel src -d lib --source-maps",
+    "build-lib": "babel src -d lib --source-maps --extensions '.ts,.js'",
     "build-types": "tsc --emitDeclarationOnly",
     "postversion": "git push origin master --follow-tags",
     "prepublishOnly": "npm run build",
     "lint": "prettier-standard --lint 'src/**/*.js' 'src/**/*.ts'",
     "test": "npm run lint",
-    "watch": "babel src --out-dir lib --watch --source-maps"
+    "watch": "babel src --out-dir lib --watch --source-maps --extensions '.ts,.js'"
   },
   "repository": {
     "type": "git",