Restore backward compatibility
Test
Merge pull request #42 from flyvictor/backward-compatibility

Restore backward compatibility