Fixed issue #4, Changed demo slightly