Push to v1.6

Added a simple (very simple) swearing filter