Updated to not require rails 3.2.13