diff --git a/README.md b/README.md
index 224df8d9c9..2b72e48c2f 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 [![Build Status](https://img.shields.io/travis/locustio/locust.svg)](https://travis-ci.org/locustio/locust)
 [![codecov](https://codecov.io/gh/locustio/locust/branch/master/graph/badge.svg)](https://codecov.io/gh/locustio/locust)
 [![license](https://img.shields.io/github/license/locustio/locust.svg)](https://github.com/locustio/locust/blob/master/LICENSE)
-[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.python.org/pypi/locustio)
-[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.python.org/pypi/locustio)
+[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.org/project/locustio/)
+[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.org/project/locustio/)
 [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)
 
 ## Links
diff --git a/docs/third-party-tools.rst b/docs/third-party-tools.rst
index 9a0a4fd58c..20b33fc03a 100644
--- a/docs/third-party-tools.rst
+++ b/docs/third-party-tools.rst
@@ -10,12 +10,14 @@ supported by many languages. So, you can write your Locust tasks in any language
 libraries do the job as a slave runner. They run your Locust tasks, and report to master regularly.
 
 
-Boomer (Golang)
+Golang 
 ---------------
 
-`Boomer <https://github.com/myzhan/boomer/>`_ is a Locust slave runner written in golang.
+- `Boomer <https://github.com/myzhan/boomer/>`_ 
 
-Locust4j (Java)
+Java
 ---------------
 
-`Locust4j <https://github.com/myzhan/locust4j>`_ is a Locust slave runner written in Java.
\ No newline at end of file
+- `Locust4j <https://github.com/myzhan/locust4j>`_ 
+
+- `Swarm <https://github.com/anhldbk/swarm>`_ 
diff --git a/locust/events.py b/locust/events.py
index de049f97b4..82c496fc14 100644
--- a/locust/events.py
+++ b/locust/events.py
@@ -113,14 +113,14 @@ def fire(self, reverse=False, **kwargs):
 """
 *master_start_hatching* is fired when we initiate the hatching process on the master.
 
-This event is especially usefull to detect when the 'start' button is clicked on the web ui.
+This event is especially useful to detect when the 'start' button is clicked on the web ui.
 """
 
 master_stop_hatching = EventHook()
 """
 *master_stop_hatching* is fired when terminate the hatching process on the master.
 
-This event is especially usefull to detect when the 'stop' button is clicked on the web ui.
+This event is especially useful to detect when the 'stop' button is clicked on the web ui.
 """
 
 locust_start_hatching = EventHook()
diff --git a/locust/main.py b/locust/main.py
index dbfa228d55..070dd6d84c 100644
--- a/locust/main.py
+++ b/locust/main.py
@@ -156,7 +156,7 @@ def load_tasksetfile(path, ignore_prefix='_'):
     dictionary of ``{'name': callable}`` containing all callables which pass
     the "is a TaskSet" test (`is_taskset`).
     """
-    return load_filterfile(path, lambda tup: is_locust(tup, ignore_prefix=ignore_prefix))
+    return load_filterfile(path, lambda tup: is_taskset(tup, ignore_prefix=ignore_prefix))
 
 
 def run_locust(options, arguments=[], cli_mode=False):