Version updated, some bugfixes, demo's updated