Update makefiles
Handle percent encoding
handle percent encoding
add underscore to regex
Merge changes