in progress
Merge branch 'master' of git@github.com:superizer/hawkeye