Performance improvements and fix for issue #47