#549 Fixed
#554 Fixed
Merge sergio branch to master