hawkeye fixes
Merge pull request #14 from jovanchohan/hawkeye_fixes

hawkeye fixes