Adding a URI buffer, to reduce memory fragmentation on NON-MMU plataforms
Merge branches 'master' and 'less-fragmentation'