CR for #40 - Keg State implementation
Incorporated feedback for #40, fixes #40
Merge branch '40-keg-states'