updated to 2014-07-29

updated to 2014-07-29
Merge pull request #12 from ChelseaStats/dev-2014-07-29

updated to 2014-07-29