Merged in @lwalkera's changes from dropbox (?!)