More dynamic work
Merge branch 'error-2' of https://github.com/jack-t/Japache into error-2