Merge pull request #11 from nicklynchjonely/master

update commits
maybe logo?
Merge pull request #25 from ddenhart/master

maybe a logo?