All small updates. Merge master branch