Riyad Kalla Merge pull request #21 from htcrails/master