Merging latest from KickJS master into glepage1 / KickJS fork

Updating glepag1 fork