Merged some changes from the master branch