Added entity implementation
Merge branch 'master' of github.com:metredigm/hunter