Updated dlls, added sample
Merge