prepare to fix
Merge branch 'master' of ssh://git@github.com/superizer/hawkeye.git