bug fixes
Merge pull request #18 from julianhinz/habana

bug fixes