Merging the current version into master

see previous pull requests