[Bug-862333] Adding in habitat
Merge pull request #21 from rossbruniges/bug-862333

[Bug-862333] Adding in habitat