Updates

Updtated sample files and readme + bug fixes