Merge pull request #11 from pedroigor/master

Several changes to layout and new documentation.
Minor fixes.