New draft
Updated to ruby 2.1