Make allocate and dealloc work correctly
Merge pull request #17 from markmcclain/havana

Make allocate and dealloc work correctly