#559 Fixed
Merge pull request #577 from pshivana/rails4_defect_fixes

#559 Fixed