some structure fixes
Merge pull request #2 from eduardoramirez/master

some structure fixes