fixed and presented version

Signed-off-by: Guillermo Orellana <wiyarmir@gmail.com>
Merge remote-tracking branch 'origin/master'