removed osicat.. did not know that required an so
Merge remote-tracking branch 'origin/master'
hack adjustment