Fix issue #3 and generally update project