Updated based on code review
Updated based on code review
Merge pull request #4 from UBC-VCL/hn-tigers

Updated based on code review