Fixes fatal parser error reported in #36
Fix surround bug
Update jar file