Merging latest changes from lightspark website