Update demo and samples According to #18
Apply last fixes