Fixes #12
Merge https://github.com/tmartin357/spsu-auv-team.github.com