Add args kwargs bits

New submission for issue #36