Changed to auto increment versioning
Fixed bug in samples