for oscon - header change
Merge pull request #1 from billtoner/proper-description-and-header

for oscon - header change