Merge ivan into master