upgraded to ruby 2.0 and few bug fixes on flow change