flashx fix
Merge remote-tracking branch 'origin/Billy2011'