Fixes for olapic
Merge pull request #1 from Olapic/ph_rcastro_fixes

Fixes for olapic