#529 Fixed
Merge pull request #589 from pshivana/rails4_defect_fixes

#529 Fixed