Merging latest updates from rohe

Fixes [issue #17](https://github.com/rohe/oictest/issues/17) and [issue #18](https://github.com/rohe/oictest/issues/18).