Updated monster elements of the project.
Merge origin/master