minor improvements
Merge remote-tracking branch 'origin/mjuliano' into integration