22 with 26 polygonfix

Incorporates issue #22 and issue #26, as well as #28 (polygon crash fix) - and it seems to run faster!