Merge pull request #2 from craiganderson/master

bringing in updates from stable/havana