Fixed small 'bugs' and added demo