Adding Hiss
Merge remote-tracking branch 'origin/pr/79'

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>