added async and defer options
added default values
Fix conflict
Merge branch 'minicstudio-master'