Updated class with merges from origin
Merge remote-tracking branch 'origin/master'