Merge branch 'master' into sean
add nokogiri in .gemspec file
Merge branch 'sean'
merge branch sean