Master modifications

Please review these commits and authorize merge to master.
@mnzaki