Pushed wrong class.
Merge pull request #456 from alexbegt/master

Pushed wrong class.