remove flash
Merge
Add a try/catch during connection
Merge with trunk