Separate class
Merge pull request #166 from Ashrey/dev

Separate class