Merge pull request #19 from francisco/master

Looks good to me!