Merging from master

Merging from the forked project's master branch.