Parse default argument if None
Include type of default value of argument in function body
Merge branch 'master' into mammoth