Merged version after documentation update