Merge pull request #440 from eandersson/master

Jython and recursive fix