Merge pull request #130 from surik/otp18

Build under R18 #129