Bugs fixed. Samples updated.