ported project to work with ruby 2.1.1