typos and structure
Merge pull request #8 from waltherg/patch-1

typos and structure