#566 Fixed
Merge pull request #586 from pshivana/rails4_defect_fixes

#566 Fixed