Merge pull request #218 from stevenvanrossem/master

some updates, mainly demo features