Added commented test
Added TypeOf
Merged back remote master