Fix bug when running from Flash builder
Merge branch 'fares'