Changed default value from '' to None
Applyed @dbrgns patch