Modified to take snake eyes into account
Merge branch 'master' into gh-pages
update