Merge pull request #11 from craiganderson/stable/havana

Stable/havana