Merge pull request #4 from starverte/master

Merge from master
Change header info
Merge pull request #96 from mbeall/master

Change header info