* Added support for more image types (.gif, .jpeg, .bmp)

* Fixed more ontology issues