Tweaks
Merge origin/master
Update readme