Used global matchers for types Fixes #65

Used underscore to check for objects functions and arrays. I have
a suspicion that the check for objects vs functions is not working
correctly.