Merge pull request #24 from rodis/master

Update to Havana version of Horizon