Initial version merge commit. Version by Daniel.
Fast commit.