Integration from FLLTS

Integration from FLLTS
Merge pull request #1 from texasdiaz/master

Integration from FLLTS