Fixing Github issue #13 (not fully)

Deals with cases of functions with parameters where the first param is not a string

Paired with @tonaglen