added default arguments
Merge branch 'master' of github.com:lindstroem/TAPY
added default arguments
merged
added default arguments, unhandled