Fixed: Parse instead of building at startup
Little optimization
Use the same code to detect file extension
Merge pull request #27 from doublefx/bundle-support

Little optimizations