Fixes #226 + syntax changes.