Merge pull request #1 from brunodbo/master

Merge latest master in gh-pages branch