Updated master to match Hans branch