Updated to ruby 2.0 syntax