Merged in default (pull request #46)

Fix the base-url (for now) and fix some mixed white space.

Approved-by: Elliott Sales de Andrade