upgraded to ruby 2
Refactored classes to keyword arguments