Merge pull request #17 from wriley/patch-3

Make icon names match object_classes->Type field
Merge remote branch 'upstream/master'