cleaned up gem
Merge branch 'feedback'