should fix issue #29

I rebased my work.