osis Merge pull request #6 from rphv/master