#559 fixed
#558 Fixed
Merge pull request #567 from pshivana/rails4_defect_fixes

Rails4 defect fixes