Faster launch as requested by Mark
Should handle all files now.
Merge pull request #9 from alexhoneygosky/master

Faster launch as requested by Mark