updates
Merge pull request #4 from ProjectGoliath/master

updates