Merge pull request #759 from xenolog/havana

new options for Havana
Merge pull request #761 from xenolog/H-20131028_PR

Horizon's fixes for Havana