Fixed a bug with the restructure for Treefrog
Merge branch 'master' into fixTreefrog
Fixed treefrog-thread
Merge pull request #1169 from TechEmpower/fixTreefrog

Fix treefrog