updated code
Merge branch 'master' into dylan
Merge pull request #23 from mbathletes/dylan

Dylan