Merge pull request #15 from apache/Update_for_TLP

Fixes for TLP: