Merge pull request #17 from ryanshawty/master

Update dev to master
Fixed headaer and fixed #11
Merge pull request #18 from ryanshawty/dev

Fixed header