Fixed and added with this pull request, ready for the release on the 20th of August