Bugfixed dispatch
Merge branch 'master' of https://github.com/gshubham/CS143P3