fixes #307
Merge branch 'develop' of github.com:Sable/soot into develop
Merge remote-tracking branch 'origin/develop' into develop-patches