Merge pull request #66 from gslender/master

Update to badge and span as per #61