Merged with remote
Minor updates
Merge branch 'master' of https://github.com/jbfolkerts/tablestakes
Minor updates