Merge pull request #31 from francisco/master

awesome!