Merge pull request #1 from zurb/master

update