Fixed issue #11
Slightly better demo page