Merge
Some small changes in readme, code formating