Merge pull request #18 from FWAJL/Development

Merge pull request #17 from FWAJL/master
Merge pull request #19 from FWAJL/Development

Resync DEV branch
Merge pull request #20 from FWAJL/Development

Manage loading source files from multi levels routes
Merge pull request #21 from FWAJL/master

Master to DEV