Fixed compilation issue
Improved stability
Merge pull request #108 from DavidMansolino/DebugTeam1

Corrected compilation issue and improve stability