Updated to work with Haystack 2.X
Merge pull request #4 from murphyke/kev-issue-2

Updated to work with Haystack 2.X