Removed compatibility code
Merge pull request #49 from enumag/patch-4

Removed compatibility code