Merge pull request #80 from uWaterloo/autoupdate

Autoupdate