Fix issue #90 and various updates