OC6 friendly
Merge pull request #11 from bastho/master

OC6 friendly