Separated class to a single file
Merge origin/master