endor/kettu — pull request #96 by Shadow6363 (2014-08-24 05:47:50+00:00)
Title: Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.