minor changes

@zemariano 
we fixed  bug please merge your branch accordignly