fix changes in order to sync develop with master

@hmunfru @flopezag