squash bugs
Merge branch 'KegCop-Chris'