merge in updates from bluehandtalking's repo
1.9 hash syntax