Merge pull request #47 from AlberFernandez/master

New XML Edition, fixed design errors