Merge pull request #1 from alefranz/master

Replaced master with current gh-pages tip