Merge pull request #87 from denizt/moc