getting demos back
Merge xgarrido's branch