Merge pull request #1129 from ryanjbaxter/master

IBM sample gadgets
Enhancements for IBM gadgets.