Merge pull request #67 from gslender/master

Fix Span solves Badge Demo issues