boazsender/Abacus — pull request #10 by mzgoddard (2011-10-15 22:56:53+00:00)
Title: #6, #7, some of #8

Fixes bugs #6, #7 and partial #8 fix