Merge changes from master branch

:smile: