#000 using ruby 1.9 syntax
Merge pull request #621 from pshivana/rails4_defect_fixes

#000 using ruby 1.9 syntax