switch to puma
Merge branch 'enhancements'