Added OSIS support, closes #3