Merging master with ivan-branch