Add support for 3.6+ default arguments

Add support for 3.6+ default arguments #209