Merge pull request #63 from johnraz/master

Fix #61, Compatibility code with django 1.5 + strenghten recursion prote...
Updated doc