Hw3 Pull Request

Please pull in changes to master