Merge changes from diveintomark repo