Hw2-Pulled from hw2 branch to master