Merge pull request #6 from ruebenramirez/master

Ship it