Merge pull request #614 from afs/compatibility

Compatibility