Multiple bug fixes and enhancements

Run git log 2.1.3..2.1.4 to see the latest changes between this tag and the last.

GabrielDumbrava
Luc Timmerman
M.Mahdi Mahdizadeh
Michael
Rafael Araujo Lehmkuhl
alichass
fialkovod
hashlash