Quick update to master (I know its a no-no:) )