Fixed formatting.
Added paths support.