Merge pull request #1 from riotcku/master

update after refactor
slight header changes
Merge pull request #7 from colinbrownec/master

slight header changes