Updates from review.
Merge pull request #133 from abentley/add-ha

Updates from review.